merge trunk
authorKenichi Handa <handa@gnu.org>
Thu, 18 Oct 2012 00:00:39 +0000 (09:00 +0900)
committerKenichi Handa <handa@gnu.org>
Thu, 18 Oct 2012 00:00:39 +0000 (09:00 +0900)
commit43242cf014ebaf0ec47e58e02eaf1a3e2facffad
treea217f94406112ebb3c5aeeadf5fe467ea510b0ae
parent01277bb78a4fe1a7efa9c8af9c5cd5e4309dbbef
parentf1040d519503f44bdc7dfbeeffd7c06e9f1db45f
merge trunk